git merge vs rebase

welcome to shbcf.ru